ca683ef2a533703645f0c5290ec99ced8005c08e,common/archive-impl/impl2/src/java/org/sakaiproject/archive/impl/SiteMerger.java,SiteMerger,merge,#String#String#String#String#boolean#String[]#boolean#String[]#,109
Before Change
File file = new File(m_storagePath + fileName);
if ((file == null) || (!file.exists()))
{
results.append("file: " + file.getPath() + " not found.\n");
M_log.warn("merge(): file not found: " + file.getPath());
return results.toString();
}
After Change
}
} catch (Exception ex) {
results.append("file: " + fileName + " not permitted.\n");
M_log.warn("merge(): file not permitted: " + file.getPath());
return results.toString();
}
}